From e6270ca43f40f3295bff03dc3af49e91c41b8616 Mon Sep 17 00:00:00 2001 From: Jonathan Michalon Date: Thu, 12 Dec 2019 09:51:40 +0100 Subject: [PATCH] Set HighContrast tooltip back to black text over white background 8abdbfee1642332688f030f53d22b995a21ce814 pulled Adwaita tooltip selectors, but in the meantime the colors were also set to Adwaita's. Push back the same behaviour as before because it's better for visually-impaired users. --- gtk/theme/HighContrast/_common.scss | 6 +++--- gtk/theme/HighContrast/gtk-contained-inverse.css | 4 ++-- gtk/theme/HighContrast/gtk-contained.css | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index 3975fc2d8b..b0caecbec6 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -3175,9 +3175,9 @@ tooltip { &.background { // background-color needs to be set this way otherwise it gets drawn twice // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details. - background-color: transparentize(black, 0.1); + background-color: $bg_color; background-clip: padding-box; - border: 1px solid $borders_color; + border: 2px solid $fg_color; } padding: 4px; /* not working */ @@ -3190,7 +3190,7 @@ tooltip { * { // Yeah this is ugly padding: 4px; background-color: transparent; - color: white; + color: $fg_color; } } diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css index 7f755261c6..f9ac7d7c03 100644 --- a/gtk/theme/HighContrast/gtk-contained-inverse.css +++ b/gtk/theme/HighContrast/gtk-contained-inverse.css @@ -1417,11 +1417,11 @@ infobar { border-width: 0; border-style: none; } /************ Tooltips * */ tooltip { padding: 4px; /* not working */ border-radius: 5px; box-shadow: none; } -tooltip.background { background-color: rgba(0, 0, 0, 0.9); background-clip: padding-box; border: 1px solid gray; } +tooltip.background { background-color: #000; background-clip: padding-box; border: 2px solid #fff; } tooltip decoration { background-color: transparent; } -tooltip * { padding: 4px; background-color: transparent; color: white; } +tooltip * { padding: 4px; background-color: transparent; color: #fff; } /***************** Color Chooser * */ colorswatch { box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px #000; } diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css index 9e2fe40922..30d9304e90 100644 --- a/gtk/theme/HighContrast/gtk-contained.css +++ b/gtk/theme/HighContrast/gtk-contained.css @@ -1423,11 +1423,11 @@ infobar { border-width: 0; border-style: none; } /************ Tooltips * */ tooltip { padding: 4px; /* not working */ border-radius: 5px; box-shadow: none; } -tooltip.background { background-color: rgba(0, 0, 0, 0.9); background-clip: padding-box; border: 1px solid gray; } +tooltip.background { background-color: #fff; background-clip: padding-box; border: 2px solid #000; } tooltip decoration { background-color: transparent; } -tooltip * { padding: 4px; background-color: transparent; color: white; } +tooltip * { padding: 4px; background-color: transparent; color: #000; } /***************** Color Chooser * */ colorswatch { box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px #fff; } -- 2.30.2